From 06449bebe1be192f5d6e56e3b6cfb7ba0f2a0175 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Thu, 17 Dec 1998 09:15:45 +0000 Subject: [PATCH] Define gdk_use_mb outside USE_XIM guard. Removed unnecessary USE_XIM guard 1998-12-17 Sebastian Wilhelmi * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed unnecessary USE_XIM guard inside another. Made gdk_use_mb static. Compile gdk_set_locale also if not USE_XIM. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/gdkim.c | 16 ++++++++-------- gdk/x11/gdkim-x11.c | 16 ++++++++-------- 9 files changed, 58 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a1e5716ae..9ff09807d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-12-17 Sebastian Wilhelmi + + * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed + unnecessary USE_XIM guard inside another. Made gdk_use_mb + static. Compile gdk_set_locale also if not USE_XIM. + Thu Dec 17 00:26:01 1998 Shawn T. Amundson * Released GTK+ 1.1.9 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2a1e5716ae..9ff09807d1 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +1998-12-17 Sebastian Wilhelmi + + * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed + unnecessary USE_XIM guard inside another. Made gdk_use_mb + static. Compile gdk_set_locale also if not USE_XIM. + Thu Dec 17 00:26:01 1998 Shawn T. Amundson * Released GTK+ 1.1.9 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2a1e5716ae..9ff09807d1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +1998-12-17 Sebastian Wilhelmi + + * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed + unnecessary USE_XIM guard inside another. Made gdk_use_mb + static. Compile gdk_set_locale also if not USE_XIM. + Thu Dec 17 00:26:01 1998 Shawn T. Amundson * Released GTK+ 1.1.9 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2a1e5716ae..9ff09807d1 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +1998-12-17 Sebastian Wilhelmi + + * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed + unnecessary USE_XIM guard inside another. Made gdk_use_mb + static. Compile gdk_set_locale also if not USE_XIM. + Thu Dec 17 00:26:01 1998 Shawn T. Amundson * Released GTK+ 1.1.9 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2a1e5716ae..9ff09807d1 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +1998-12-17 Sebastian Wilhelmi + + * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed + unnecessary USE_XIM guard inside another. Made gdk_use_mb + static. Compile gdk_set_locale also if not USE_XIM. + Thu Dec 17 00:26:01 1998 Shawn T. Amundson * Released GTK+ 1.1.9 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2a1e5716ae..9ff09807d1 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +1998-12-17 Sebastian Wilhelmi + + * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed + unnecessary USE_XIM guard inside another. Made gdk_use_mb + static. Compile gdk_set_locale also if not USE_XIM. + Thu Dec 17 00:26:01 1998 Shawn T. Amundson * Released GTK+ 1.1.9 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2a1e5716ae..9ff09807d1 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +1998-12-17 Sebastian Wilhelmi + + * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed + unnecessary USE_XIM guard inside another. Made gdk_use_mb + static. Compile gdk_set_locale also if not USE_XIM. + Thu Dec 17 00:26:01 1998 Shawn T. Amundson * Released GTK+ 1.1.9 diff --git a/gdk/gdkim.c b/gdk/gdkim.c index 417430d0f0..c28ecea88c 100644 --- a/gdk/gdkim.c +++ b/gdk/gdkim.c @@ -23,6 +23,12 @@ #include "gdki18n.h" #include "gdkx.h" +/* If this variable is FALSE, it indicates that we should + * avoid trying to use multibyte conversion functions and + * assume everything is 1-byte per character + */ +static gboolean gdk_use_mb; + #ifdef USE_XIM #include @@ -40,14 +46,6 @@ typedef struct { gpointer value; } GdkImArg; -/* If this variable is FALSE, it indicates that we should - * avoid trying to use multibyte conversion functions and - * assume everything is 1-byte per character - */ -gboolean gdk_use_mb; - -#ifdef USE_XIM - static void gdk_im_instantiate_cb (Display *display, XPointer client_data, XPointer call_data); @@ -131,6 +129,8 @@ gdk_set_locale (void) return setlocale (LC_ALL,NULL); } +#ifdef USE_XIM + /* *-------------------------------------------------------------- * gdk_im_begin diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c index 417430d0f0..c28ecea88c 100644 --- a/gdk/x11/gdkim-x11.c +++ b/gdk/x11/gdkim-x11.c @@ -23,6 +23,12 @@ #include "gdki18n.h" #include "gdkx.h" +/* If this variable is FALSE, it indicates that we should + * avoid trying to use multibyte conversion functions and + * assume everything is 1-byte per character + */ +static gboolean gdk_use_mb; + #ifdef USE_XIM #include @@ -40,14 +46,6 @@ typedef struct { gpointer value; } GdkImArg; -/* If this variable is FALSE, it indicates that we should - * avoid trying to use multibyte conversion functions and - * assume everything is 1-byte per character - */ -gboolean gdk_use_mb; - -#ifdef USE_XIM - static void gdk_im_instantiate_cb (Display *display, XPointer client_data, XPointer call_data); @@ -131,6 +129,8 @@ gdk_set_locale (void) return setlocale (LC_ALL,NULL); } +#ifdef USE_XIM + /* *-------------------------------------------------------------- * gdk_im_begin -- 2.30.2